From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 14 May 2001 14:54:29 +0000 (+0000)
Subject: (note_mouse_highlight): Avoid changing the mouse
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~40312
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cd3990d6eccc0173b4843d5e2971f1acbb45a004;p=emacs.git

(note_mouse_highlight): Avoid changing the mouse
pointer shape when show_mouse_face has already done it.
---

diff --git a/src/xterm.c b/src/xterm.c
index 056514d7096..3dfe0fac2aa 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6997,6 +6997,7 @@ note_mouse_highlight (f, x, y)
 
 	      /* Display it as active.  */
 	      show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
+	      cursor = None;
 	    }
 	  /* Handle the text property case.  */
 	  else if (!NILP (mouse_face) && BUFFERP (object))
@@ -7038,6 +7039,7 @@ note_mouse_highlight (f, x, y)
 
 	      /* Display it as active.  */
 	      show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
+	      cursor = None;
 	    }
 	  else if (!NILP (mouse_face) && STRINGP (object))
 	    {
@@ -7069,6 +7071,7 @@ note_mouse_highlight (f, x, y)
 		= face_at_string_position (w, object, pos, 0, 0, 0, &ignore,
 					   glyph->face_id, 1);
 	      show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
+	      cursor = None;
 	    }
 	}